Autogenerated HTML docs for v1.5.0-rc1-g6f71
diff --git a/cmds-ancillaryinterrogators.txt b/cmds-ancillaryinterrogators.txt index 7398348..f5fef71 100644 --- a/cmds-ancillaryinterrogators.txt +++ b/cmds-ancillaryinterrogators.txt
@@ -1,50 +1,32 @@ gitlink:git-annotate[1]:: Annotate file lines with commit info. +gitlink:git-applymbox[1]:: + Apply a series of patches in a mailbox. + gitlink:git-blame[1]:: Show what revision and author last modified each line of a file. -gitlink:git-check-ref-format[1]:: - Make sure ref name is well formed. - gitlink:git-cherry[1]:: Find commits not merged upstream. gitlink:git-count-objects[1]:: Count unpacked number of objects and their disk consumption. -gitlink:git-daemon[1]:: - A really simple server for git repositories. - -gitlink:git-fmt-merge-msg[1]:: - Produce a merge commit message. +gitlink:git-fsck-objects[1]:: + Verifies the connectivity and validity of the objects in the database. gitlink:git-get-tar-commit-id[1]:: Extract commit ID from an archive created using git-tar-tree. -gitlink:git-imap-send[1]:: - Dump a mailbox from stdin into an imap folder. - gitlink:git-instaweb[1]:: Instantly browse your working repository in gitweb. -gitlink:git-mailinfo[1]:: - Extracts patch and authorship from a single e-mail message. - -gitlink:git-mailsplit[1]:: - Simple UNIX mbox splitter program. - gitlink:git-merge-tree[1]:: Show three-way merge without touching index. -gitlink:git-parse-remote[1]:: - Routines to help parsing remote repository access parameters. - -gitlink:git-patch-id[1]:: - Compute unique ID for a patch. - -gitlink:git-request-pull[1]:: - Generates a summary of pending changes. +gitlink:git-rerere[1]:: + Reuse recorded resolution of conflicted merges. gitlink:git-rev-parse[1]:: Pick out and massage parameters. @@ -52,12 +34,12 @@ gitlink:git-runstatus[1]:: A helper for git-status and git-commit. -gitlink:git-send-email[1]:: - Send a collection of patches as emails. +gitlink:git-show-branch[1]:: + Show branches and their commits. -gitlink:git-stripspace[1]:: - Filter out empty lines. +gitlink:git-verify-tag[1]:: + Check the GPG signature of tag. -gitlink:git-symbolic-ref[1]:: - Read and modify symbolic refs. +gitlink:git-whatchanged[1]:: + Show logs with difference each commit introduces.
diff --git a/cmds-ancillarymanipulators.txt b/cmds-ancillarymanipulators.txt index 638a132..993482c 100644 --- a/cmds-ancillarymanipulators.txt +++ b/cmds-ancillarymanipulators.txt
@@ -1,57 +1,24 @@ -gitlink:git-applypatch[1]:: - Apply one patch extracted from an e-mail. - -gitlink:git-archimport[1]:: - Import an Arch repository into git. - gitlink:git-convert-objects[1]:: Converts old-style git repository. -gitlink:git-cvsexportcommit[1]:: - Export a single commit to a CVS checkout. - -gitlink:git-cvsimport[1]:: - Salvage your data out of another SCM people love to hate. - -gitlink:git-cvsserver[1]:: - A CVS server emulator for git. - -gitlink:git-gc[1]:: - Cleanup unnecessary files and optimize the local repository. - gitlink:git-lost-found[1]:: Recover lost refs that luckily have not yet been pruned. -gitlink:git-merge-one-file[1]:: - The standard helper program to use with git-merge-index. +gitlink:git-pack-refs[1]:: + Pack heads and tags for efficient repository access. gitlink:git-prune[1]:: Prunes all unreachable objects from the object database. -gitlink:git-quiltimport[1]:: - Applies a quilt patchset onto the current branch. - gitlink:git-reflog[1]:: Manage reflog information. gitlink:git-relink[1]:: Hardlink common objects in local repositories. -gitlink:git-sh-setup[1]:: - Common git shell script setup code. +gitlink:git-repack[1]:: + Pack unpacked objects in a repository. -gitlink:git-svn[1]:: - Bidirectional operation between a single Subversion branch and git. - -gitlink:git-svnimport[1]:: - Import a SVN repository into git. - -gitlink:git-symbolic-ref[1]:: - Read and modify symbolic refs. - -gitlink:git-tag[1]:: - Create or verify a tag object signed with GPG. - -gitlink:git-update-ref[1]:: - Update the object name stored in a ref safely. +gitlink:git-repo-config[1]:: + Get and set repository or global options.
diff --git a/cmds-foreignscminterface.txt b/cmds-foreignscminterface.txt new file mode 100644 index 0000000..8880bb9 --- /dev/null +++ b/cmds-foreignscminterface.txt
@@ -0,0 +1,30 @@ +gitlink:git-archimport[1]:: + Import an Arch repository into git. + +gitlink:git-cvsexportcommit[1]:: + Export a single commit to a CVS checkout. + +gitlink:git-cvsimport[1]:: + Salvage your data out of another SCM people love to hate. + +gitlink:git-cvsserver[1]:: + A CVS server emulator for git. + +gitlink:git-imap-send[1]:: + Dump a mailbox from stdin into an imap folder. + +gitlink:git-quiltimport[1]:: + Applies a quilt patchset onto the current branch. + +gitlink:git-request-pull[1]:: + Generates a summary of pending changes. + +gitlink:git-send-email[1]:: + Send a collection of patches as emails. + +gitlink:git-svn[1]:: + Bidirectional operation between a single Subversion branch and git. + +gitlink:git-svnimport[1]:: + Import a SVN repository into git. +
diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index 05c5965..8184653 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt
@@ -4,9 +4,6 @@ gitlink:git-am[1]:: Apply a series of patches from a mailbox. -gitlink:git-applymbox[1]:: - Apply a series of patches in a mailbox. - gitlink:git-archive[1]:: Creates an archive of files from a named tree. @@ -31,6 +28,9 @@ gitlink:git-commit[1]:: Record changes to the repository. +gitlink:git-describe[1]:: + Show the most recent tag that is reachable from a commit. + gitlink:git-diff[1]:: Show changes between commits, commit and working tree, etc. @@ -40,27 +40,27 @@ gitlink:git-format-patch[1]:: Prepare patches for e-mail submission. +gitlink:git-gc[1]:: + Cleanup unnecessary files and optimize the local repository. + gitlink:git-grep[1]:: Print lines matching a pattern. +gitlink:git-init[1]:: + Create an empty git repository or reinitialize an existing one. + gitlink:gitk[1]:: The git repository browser. gitlink:git-log[1]:: Show commit logs. -gitlink:git-ls-remote[1]:: - List references in a remote repository. - gitlink:git-merge[1]:: Join two or more development histories together. gitlink:git-mv[1]:: Move or rename a file, a directory, or a symlink. -gitlink:git-pack-refs[1]:: - Pack heads and tags for efficient repository access. - gitlink:git-pull[1]:: Fetch from and merge with another repository or a local branch. @@ -70,12 +70,6 @@ gitlink:git-rebase[1]:: Forward-port local commits to the updated upstream head. -gitlink:git-repack[1]:: - Pack unpacked objects in a repository. - -gitlink:git-rerere[1]:: - Reuse recorded resolution of conflicted merges. - gitlink:git-reset[1]:: Reset current HEAD to the specified state. @@ -94,15 +88,9 @@ gitlink:git-show[1]:: Show various types of objects. -gitlink:git-show-branch[1]:: - Show branches and their commits. - gitlink:git-status[1]:: Show the working tree status. -gitlink:git-verify-tag[1]:: - Check the GPG signature of tag. - -gitlink:git-whatchanged[1]:: - Show logs with difference each commit introduces. +gitlink:git-tag[1]:: + Create or verify a tag object signed with GPG.
diff --git a/cmds-plumbinginterrogators.txt b/cmds-plumbinginterrogators.txt index 28580ea..ad22563 100644 --- a/cmds-plumbinginterrogators.txt +++ b/cmds-plumbinginterrogators.txt
@@ -1,9 +1,6 @@ gitlink:git-cat-file[1]:: Provide content or type/size information for repository objects. -gitlink:git-describe[1]:: - Show the most recent tag that is reachable from a commit. - gitlink:git-diff-files[1]:: Compares files in the working tree and the index. @@ -19,12 +16,12 @@ gitlink:git-for-each-ref[1]:: Output information on each ref. -gitlink:git-fsck-objects[1]:: - Verifies the connectivity and validity of the objects in the database. - gitlink:git-ls-files[1]:: Show information about files in the index and the working tree. +gitlink:git-ls-remote[1]:: + List references in a remote repository. + gitlink:git-ls-tree[1]:: List the contents of a tree object.
diff --git a/cmds-plumbingmanipulators.txt b/cmds-plumbingmanipulators.txt index 4363877..a7eba19 100644 --- a/cmds-plumbingmanipulators.txt +++ b/cmds-plumbingmanipulators.txt
@@ -13,9 +13,6 @@ gitlink:git-index-pack[1]:: Build pack index file for an existing packed archive. -gitlink:git-init[1]:: - Create an empty git repository or reinitialize an existing one. - gitlink:git-merge-file[1]:: Run a three-way file merge. @@ -37,8 +34,8 @@ gitlink:git-read-tree[1]:: Reads tree information into the index. -gitlink:git-repo-config[1]:: - Get and set repository or global options. +gitlink:git-symbolic-ref[1]:: + Read and modify symbolic refs. gitlink:git-unpack-objects[1]:: Unpack objects from a packed archive. @@ -46,6 +43,9 @@ gitlink:git-update-index[1]:: Register file contents in the working tree to the index. +gitlink:git-update-ref[1]:: + Update the object name stored in a ref safely. + gitlink:git-write-tree[1]:: Create a tree object from the current index.
diff --git a/cmds-purehelpers.txt b/cmds-purehelpers.txt new file mode 100644 index 0000000..d0cc569 --- /dev/null +++ b/cmds-purehelpers.txt
@@ -0,0 +1,30 @@ +gitlink:git-applypatch[1]:: + Apply one patch extracted from an e-mail. + +gitlink:git-check-ref-format[1]:: + Make sure ref name is well formed. + +gitlink:git-fmt-merge-msg[1]:: + Produce a merge commit message. + +gitlink:git-mailinfo[1]:: + Extracts patch and authorship from a single e-mail message. + +gitlink:git-mailsplit[1]:: + Simple UNIX mbox splitter program. + +gitlink:git-merge-one-file[1]:: + The standard helper program to use with git-merge-index. + +gitlink:git-patch-id[1]:: + Compute unique ID for a patch. + +gitlink:git-peek-remote[1]:: + List the references in a remote repository. + +gitlink:git-sh-setup[1]:: + Common git shell script setup code. + +gitlink:git-stripspace[1]:: + Filter out empty lines. +
diff --git a/cmds-synchelpers.txt b/cmds-synchelpers.txt new file mode 100644 index 0000000..e04554a --- /dev/null +++ b/cmds-synchelpers.txt
@@ -0,0 +1,21 @@ +gitlink:git-http-fetch[1]:: + Download from a remote git repository via HTTP. + +gitlink:git-http-push[1]:: + Push objects over HTTP/DAV to another repository. + +gitlink:git-parse-remote[1]:: + Routines to help parsing remote repository access parameters. + +gitlink:git-receive-pack[1]:: + Receive what is pushed into the repository. + +gitlink:git-shell[1]:: + Restricted login shell for GIT-only SSH access. + +gitlink:git-upload-archive[1]:: + Send archive back to git-archive. + +gitlink:git-upload-pack[1]:: + Send objects packed back to git-fetch-pack. +
diff --git a/cmds-synchingrepositories.txt b/cmds-synchingrepositories.txt index 01b5bb9..736818f 100644 --- a/cmds-synchingrepositories.txt +++ b/cmds-synchingrepositories.txt
@@ -1,27 +1,15 @@ +gitlink:git-daemon[1]:: + A really simple server for git repositories. + gitlink:git-fetch-pack[1]:: Receive missing objects from another repository. -gitlink:git-http-fetch[1]:: - Download from a remote git repository via HTTP. - -gitlink:git-http-push[1]:: - Push objects over HTTP/DAV to another repository. - gitlink:git-local-fetch[1]:: Duplicate another git repository on a local system. -gitlink:git-peek-remote[1]:: - List the references in a remote repository. - -gitlink:git-receive-pack[1]:: - Receive what is pushed into the repository. - gitlink:git-send-pack[1]:: Push objects over git protocol to another reposiotory. -gitlink:git-shell[1]:: - Restricted login shell for GIT-only SSH access. - gitlink:git-ssh-fetch[1]:: Fetch from a remote repository over ssh connection. @@ -31,9 +19,3 @@ gitlink:git-update-server-info[1]:: Update auxiliary info file to help dumb servers. -gitlink:git-upload-archive[1]:: - Send archive back to git-archive. - -gitlink:git-upload-pack[1]:: - Send objects packed back to git-fetch-pack. -
diff --git a/config.txt b/config.txt index da7fde5..f1f409d 100644 --- a/config.txt +++ b/config.txt
@@ -356,6 +356,10 @@ The default set of "refspec" for gitlink:git-push[1]. See gitlink:git-push[1]. +remote.<name>.receivepack:: + The default program to execute on the remote side when pulling. See + option \--exec of gitlink:git-push[1]. + repack.usedeltabaseoffset:: Allow gitlink:git-repack[1] to create packs that uses delta-base offset. Defaults to false.
diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 12c00f3..e77750f 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-fetch-pack</em> [-q] [-k] [--exec=<git-upload-pack>] [<host>:]<directory> [<refs>…]</p> +<p><em>git-fetch-pack</em> [--all] [--quiet|-q] [--keep|-k] [--thin] [--exec=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>…]</p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -291,7 +291,15 @@ <div class="sectionbody"> <dl> <dt> --q +--all +</dt> +<dd> +<p> + Fetch all remote refs. +</p> +</dd> +<dt> +--quiet, \-q </dt> <dd> <p> @@ -300,7 +308,7 @@ </p> </dd> <dt> --k +--keep, \-k </dt> <dd> <p> @@ -311,6 +319,15 @@ </p> </dd> <dt> +--thin +</dt> +<dd> +<p> + Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. +</p> +</dd> +<dt> --exec=<git-upload-pack> </dt> <dd> @@ -328,6 +345,22 @@ </p> </dd> <dt> +--depth=<n> +</dt> +<dd> +<p> + Limit fetching to ancestor-chains not longer than n. +</p> +</dd> +<dt> +\-v +</dt> +<dd> +<p> + Run verbosely. +</p> +</dd> +<dt> <host> </dt> <dd> @@ -371,7 +404,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 17-Jan-2007 23:27:39 UTC +Last updated 20-Jan-2007 02:22:38 UTC </div> </div> </body>
diff --git a/git-fetch-pack.txt b/git-fetch-pack.txt index 90ef127..bd8ebac 100644 --- a/git-fetch-pack.txt +++ b/git-fetch-pack.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- -'git-fetch-pack' [-q] [-k] [--exec=<git-upload-pack>] [<host>:]<directory> [<refs>...] +'git-fetch-pack' [--all] [--quiet|-q] [--keep|-k] [--thin] [--exec=<git-upload-pack>] [--depth=<n>] [-v] [<host>:]<directory> [<refs>...] DESCRIPTION ----------- @@ -28,17 +28,24 @@ OPTIONS ------- --q:: +\--all:: + Fetch all remote refs. + +\--quiet, \-q:: Pass '-q' flag to 'git-unpack-objects'; this makes the cloning process less verbose. --k:: +\--keep, \-k:: Do not invoke 'git-unpack-objects' on received data, but create a single packfile out of it instead, and store it in the object database. If provided twice then the pack is locked against repacking. ---exec=<git-upload-pack>:: +\--thin:: + Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. + +\--exec=<git-upload-pack>:: Use this to specify the path to 'git-upload-pack' on the remote side, if is not found on your $PATH. Installations of sshd ignores the user's environment @@ -50,6 +57,12 @@ shells by having a lean .bashrc file (they set most of the things up in .bash_profile). +\--depth=<n>:: + Limit fetching to ancestor-chains not longer than n. + +\-v:: + Run verbosely. + <host>:: A remote host that houses the repository. When this part is specified, 'git-upload-pack' is invoked via
diff --git a/git-push.html b/git-push.html index bba84c0..0c3f920 100644 --- a/git-push.html +++ b/git-push.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-push</em> [--all] [--tags] [--exec=<receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>…]</p> +<p><em>git-push</em> [--all] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>…]</p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -344,7 +344,7 @@ </p> </dd> <dt> ---exec +--receive-pack=<git-receive-pack> </dt> <dd> <p> @@ -355,6 +355,14 @@ </p> </dd> <dt> +--exec=<git-receive-pack> +</dt> +<dd> +<p> + Same as --receive-pack=<git-receive-pack>. +</p> +</dd> +<dt> -f, --force </dt> <dd> @@ -544,7 +552,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 16-Jan-2007 22:04:59 UTC +Last updated 20-Jan-2007 02:22:39 UTC </div> </div> </body>
diff --git a/git-push.txt b/git-push.txt index 3e8dbcf..f8cc2b5 100644 --- a/git-push.txt +++ b/git-push.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- -'git-push' [--all] [--tags] [--exec=<receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...] +'git-push' [--all] [--tags] [--receive-pack=<git-receive-pack>] [--repo=all] [-f | --force] [-v] [<repository> <refspec>...] DESCRIPTION ----------- @@ -67,12 +67,15 @@ addition to refspecs explicitly listed on the command line. -\--exec:: +\--receive-pack=<git-receive-pack>:: Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. +\--exec=<git-receive-pack>:: + Same as \--receive-pack=<git-receive-pack>. + -f, \--force:: Usually, the command refuses to update a remote ref that is not a descendant of the local ref used to overwrite it.
diff --git a/git-repo-config.html b/git-repo-config.html index 0a979cf..58f8f4b 100644 --- a/git-repo-config.html +++ b/git-repo-config.html
@@ -1163,6 +1163,15 @@ </p> </dd> <dt> +remote.<name>.receivepack +</dt> +<dd> +<p> + The default program to execute on the remote side when pulling. See + option --exec of <a href="git-push.html">git-push(1)</a>. +</p> +</dd> +<dt> repack.usedeltabaseoffset </dt> <dd> @@ -1284,7 +1293,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2007 00:37:31 UTC +Last updated 20-Jan-2007 02:22:39 UTC </div> </div> </body>
diff --git a/git-send-pack.html b/git-send-pack.html index 3ef3baf..b308f35 100644 --- a/git-send-pack.html +++ b/git-send-pack.html
@@ -272,7 +272,7 @@ </div> <h2>SYNOPSIS</h2> <div class="sectionbody"> -<p><em>git-send-pack</em> [--all] [--force] [--exec=<git-receive-pack>] [<host>:]<directory> [<ref>…]</p> +<p><em>git-send-pack</em> [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>…]</p> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -285,7 +285,7 @@ <div class="sectionbody"> <dl> <dt> ---exec=<git-receive-pack> +--receive-pack=<git-receive-pack> </dt> <dd> <p> @@ -296,6 +296,14 @@ </p> </dd> <dt> +--exec=<git-receive-pack> +</dt> +<dd> +<p> + Same as --receive-pack=<git-receive-pack>. +</p> +</dd> +<dt> --all </dt> <dd> @@ -317,6 +325,23 @@ </p> </dd> <dt> +--verbose +</dt> +<dd> +<p> + Run verbosely. +</p> +</dd> +<dt> +--thin +</dt> +<dd> +<p> + Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. +</p> +</dd> +<dt> <host> </dt> <dd> @@ -418,7 +443,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2007 00:37:32 UTC +Last updated 20-Jan-2007 02:22:40 UTC </div> </div> </body>
diff --git a/git-send-pack.txt b/git-send-pack.txt index eea8fe8..2f6267c 100644 --- a/git-send-pack.txt +++ b/git-send-pack.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- -'git-send-pack' [--all] [--force] [--exec=<git-receive-pack>] [<host>:]<directory> [<ref>...] +'git-send-pack' [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...] DESCRIPTION ----------- @@ -21,23 +21,33 @@ OPTIONS ------- ---exec=<git-receive-pack>:: +\--receive-pack=<git-receive-pack>:: Path to the 'git-receive-pack' program on the remote end. Sometimes useful when pushing to a remote repository over ssh, and you do not have the program in a directory on the default $PATH. ---all:: +\--exec=<git-receive-pack>:: + Same as \--receive-pack=<git-receive-pack>. + +\--all:: Instead of explicitly specifying which refs to update, update all refs that locally exist. ---force:: +\--force:: Usually, the command refuses to update a remote ref that is not an ancestor of the local ref used to overwrite it. This flag disables the check. What this means is that the remote repository can lose commits; use it with care. +\--verbose:: + Run verbosely. + +\--thin:: + Spend extra cycles to minimize the number of objects to be sent. + Use it on slower connection. + <host>:: A remote host to house the repository. When this part is specified, 'git-receive-pack' is invoked via
diff --git a/git.html b/git.html index c9e29c3..d866c98 100644 --- a/git.html +++ b/git.html
@@ -386,14 +386,6 @@ </p> </dd> <dt> -<a href="git-applymbox.html">git-applymbox(1)</a> -</dt> -<dd> -<p> - Apply a series of patches in a mailbox. -</p> -</dd> -<dt> <a href="git-archive.html">git-archive(1)</a> </dt> <dd> @@ -458,6 +450,14 @@ </p> </dd> <dt> +<a href="git-describe.html">git-describe(1)</a> +</dt> +<dd> +<p> + Show the most recent tag that is reachable from a commit. +</p> +</dd> +<dt> <a href="git-diff.html">git-diff(1)</a> </dt> <dd> @@ -482,6 +482,14 @@ </p> </dd> <dt> +<a href="git-gc.html">git-gc(1)</a> +</dt> +<dd> +<p> + Cleanup unnecessary files and optimize the local repository. +</p> +</dd> +<dt> <a href="git-grep.html">git-grep(1)</a> </dt> <dd> @@ -490,6 +498,14 @@ </p> </dd> <dt> +<a href="git-init.html">git-init(1)</a> +</dt> +<dd> +<p> + Create an empty git repository or reinitialize an existing one. +</p> +</dd> +<dt> <a href="gitk.html">gitk(1)</a> </dt> <dd> @@ -506,14 +522,6 @@ </p> </dd> <dt> -<a href="git-ls-remote.html">git-ls-remote(1)</a> -</dt> -<dd> -<p> - List references in a remote repository. -</p> -</dd> -<dt> <a href="git-merge.html">git-merge(1)</a> </dt> <dd> @@ -530,14 +538,6 @@ </p> </dd> <dt> -<a href="git-pack-refs.html">git-pack-refs(1)</a> -</dt> -<dd> -<p> - Pack heads and tags for efficient repository access. -</p> -</dd> -<dt> <a href="git-pull.html">git-pull(1)</a> </dt> <dd> @@ -562,22 +562,6 @@ </p> </dd> <dt> -<a href="git-repack.html">git-repack(1)</a> -</dt> -<dd> -<p> - Pack unpacked objects in a repository. -</p> -</dd> -<dt> -<a href="git-rerere.html">git-rerere(1)</a> -</dt> -<dd> -<p> - Reuse recorded resolution of conflicted merges. -</p> -</dd> -<dt> <a href="git-reset.html">git-reset(1)</a> </dt> <dd> @@ -626,14 +610,6 @@ </p> </dd> <dt> -<a href="git-show-branch.html">git-show-branch(1)</a> -</dt> -<dd> -<p> - Show branches and their commits. -</p> -</dd> -<dt> <a href="git-status.html">git-status(1)</a> </dt> <dd> @@ -642,6 +618,189 @@ </p> </dd> <dt> +<a href="git-tag.html">git-tag(1)</a> +</dt> +<dd> +<p> + Create or verify a tag object signed with GPG. +</p> +</dd> +</dl> +<h3>Ancillary Commands</h3> +<p>Manipulators:</p> +<dl> +<dt> +<a href="git-convert-objects.html">git-convert-objects(1)</a> +</dt> +<dd> +<p> + Converts old-style git repository. +</p> +</dd> +<dt> +<a href="git-lost-found.html">git-lost-found(1)</a> +</dt> +<dd> +<p> + Recover lost refs that luckily have not yet been pruned. +</p> +</dd> +<dt> +<a href="git-pack-refs.html">git-pack-refs(1)</a> +</dt> +<dd> +<p> + Pack heads and tags for efficient repository access. +</p> +</dd> +<dt> +<a href="git-prune.html">git-prune(1)</a> +</dt> +<dd> +<p> + Prunes all unreachable objects from the object database. +</p> +</dd> +<dt> +<a href="git-reflog.html">git-reflog(1)</a> +</dt> +<dd> +<p> + Manage reflog information. +</p> +</dd> +<dt> +<a href="git-relink.html">git-relink(1)</a> +</dt> +<dd> +<p> + Hardlink common objects in local repositories. +</p> +</dd> +<dt> +<a href="git-repack.html">git-repack(1)</a> +</dt> +<dd> +<p> + Pack unpacked objects in a repository. +</p> +</dd> +<dt> +<a href="git-repo-config.html">git-repo-config(1)</a> +</dt> +<dd> +<p> + Get and set repository or global options. +</p> +</dd> +</dl> +<p>Interrogators:</p> +<dl> +<dt> +<a href="git-annotate.html">git-annotate(1)</a> +</dt> +<dd> +<p> + Annotate file lines with commit info. +</p> +</dd> +<dt> +<a href="git-applymbox.html">git-applymbox(1)</a> +</dt> +<dd> +<p> + Apply a series of patches in a mailbox. +</p> +</dd> +<dt> +<a href="git-blame.html">git-blame(1)</a> +</dt> +<dd> +<p> + Show what revision and author last modified each line of a file. +</p> +</dd> +<dt> +<a href="git-cherry.html">git-cherry(1)</a> +</dt> +<dd> +<p> + Find commits not merged upstream. +</p> +</dd> +<dt> +<a href="git-count-objects.html">git-count-objects(1)</a> +</dt> +<dd> +<p> + Count unpacked number of objects and their disk consumption. +</p> +</dd> +<dt> +<a href="git-fsck-objects.html">git-fsck-objects(1)</a> +</dt> +<dd> +<p> + Verifies the connectivity and validity of the objects in the database. +</p> +</dd> +<dt> +<a href="git-get-tar-commit-id.html">git-get-tar-commit-id(1)</a> +</dt> +<dd> +<p> + Extract commit ID from an archive created using git-tar-tree. +</p> +</dd> +<dt> +<a href="git-instaweb.html">git-instaweb(1)</a> +</dt> +<dd> +<p> + Instantly browse your working repository in gitweb. +</p> +</dd> +<dt> +<a href="git-merge-tree.html">git-merge-tree(1)</a> +</dt> +<dd> +<p> + Show three-way merge without touching index. +</p> +</dd> +<dt> +<a href="git-rerere.html">git-rerere(1)</a> +</dt> +<dd> +<p> + Reuse recorded resolution of conflicted merges. +</p> +</dd> +<dt> +<a href="git-rev-parse.html">git-rev-parse(1)</a> +</dt> +<dd> +<p> + Pick out and massage parameters. +</p> +</dd> +<dt> +<a href="git-runstatus.html">git-runstatus(1)</a> +</dt> +<dd> +<p> + A helper for git-status and git-commit. +</p> +</dd> +<dt> +<a href="git-show-branch.html">git-show-branch(1)</a> +</dt> +<dd> +<p> + Show branches and their commits. +</p> +</dd> +<dt> <a href="git-verify-tag.html">git-verify-tag(1)</a> </dt> <dd> @@ -658,18 +817,11 @@ </p> </dd> </dl> -<h3>Ancillary Commands</h3> -<p>Manipulators:</p> +<h3>Interacting with Others</h3> +<p>These commands are to interact with foreign SCM and with other +people via patch over e-mail.</p> <dl> <dt> -<a href="git-applypatch.html">git-applypatch(1)</a> -</dt> -<dd> -<p> - Apply one patch extracted from an e-mail. -</p> -</dd> -<dt> <a href="git-archimport.html">git-archimport(1)</a> </dt> <dd> @@ -678,14 +830,6 @@ </p> </dd> <dt> -<a href="git-convert-objects.html">git-convert-objects(1)</a> -</dt> -<dd> -<p> - Converts old-style git repository. -</p> -</dd> -<dt> <a href="git-cvsexportcommit.html">git-cvsexportcommit(1)</a> </dt> <dd> @@ -710,35 +854,11 @@ </p> </dd> <dt> -<a href="git-gc.html">git-gc(1)</a> +<a href="git-imap-send.html">git-imap-send(1)</a> </dt> <dd> <p> - Cleanup unnecessary files and optimize the local repository. -</p> -</dd> -<dt> -<a href="git-lost-found.html">git-lost-found(1)</a> -</dt> -<dd> -<p> - Recover lost refs that luckily have not yet been pruned. -</p> -</dd> -<dt> -<a href="git-merge-one-file.html">git-merge-one-file(1)</a> -</dt> -<dd> -<p> - The standard helper program to use with git-merge-index. -</p> -</dd> -<dt> -<a href="git-prune.html">git-prune(1)</a> -</dt> -<dd> -<p> - Prunes all unreachable objects from the object database. + Dump a mailbox from stdin into an imap folder. </p> </dd> <dt> @@ -750,27 +870,19 @@ </p> </dd> <dt> -<a href="git-reflog.html">git-reflog(1)</a> +<a href="git-request-pull.html">git-request-pull(1)</a> </dt> <dd> <p> - Manage reflog information. + Generates a summary of pending changes. </p> </dd> <dt> -<a href="git-relink.html">git-relink(1)</a> +<a href="git-send-email.html">git-send-email(1)</a> </dt> <dd> <p> - Hardlink common objects in local repositories. -</p> -</dd> -<dt> -<a href="git-sh-setup.html">git-sh-setup(1)</a> -</dt> -<dd> -<p> - Common git shell script setup code. + Send a collection of patches as emails. </p> </dd> <dt> @@ -789,201 +901,6 @@ Import a SVN repository into git. </p> </dd> -<dt> -<a href="git-symbolic-ref.html">git-symbolic-ref(1)</a> -</dt> -<dd> -<p> - Read and modify symbolic refs. -</p> -</dd> -<dt> -<a href="git-tag.html">git-tag(1)</a> -</dt> -<dd> -<p> - Create or verify a tag object signed with GPG. -</p> -</dd> -<dt> -<a href="git-update-ref.html">git-update-ref(1)</a> -</dt> -<dd> -<p> - Update the object name stored in a ref safely. -</p> -</dd> -</dl> -<p>Interrogators:</p> -<dl> -<dt> -<a href="git-annotate.html">git-annotate(1)</a> -</dt> -<dd> -<p> - Annotate file lines with commit info. -</p> -</dd> -<dt> -<a href="git-blame.html">git-blame(1)</a> -</dt> -<dd> -<p> - Show what revision and author last modified each line of a file. -</p> -</dd> -<dt> -<a href="git-check-ref-format.html">git-check-ref-format(1)</a> -</dt> -<dd> -<p> - Make sure ref name is well formed. -</p> -</dd> -<dt> -<a href="git-cherry.html">git-cherry(1)</a> -</dt> -<dd> -<p> - Find commits not merged upstream. -</p> -</dd> -<dt> -<a href="git-count-objects.html">git-count-objects(1)</a> -</dt> -<dd> -<p> - Count unpacked number of objects and their disk consumption. -</p> -</dd> -<dt> -<a href="git-daemon.html">git-daemon(1)</a> -</dt> -<dd> -<p> - A really simple server for git repositories. -</p> -</dd> -<dt> -<a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a> -</dt> -<dd> -<p> - Produce a merge commit message. -</p> -</dd> -<dt> -<a href="git-get-tar-commit-id.html">git-get-tar-commit-id(1)</a> -</dt> -<dd> -<p> - Extract commit ID from an archive created using git-tar-tree. -</p> -</dd> -<dt> -<a href="git-imap-send.html">git-imap-send(1)</a> -</dt> -<dd> -<p> - Dump a mailbox from stdin into an imap folder. -</p> -</dd> -<dt> -<a href="git-instaweb.html">git-instaweb(1)</a> -</dt> -<dd> -<p> - Instantly browse your working repository in gitweb. -</p> -</dd> -<dt> -<a href="git-mailinfo.html">git-mailinfo(1)</a> -</dt> -<dd> -<p> - Extracts patch and authorship from a single e-mail message. -</p> -</dd> -<dt> -<a href="git-mailsplit.html">git-mailsplit(1)</a> -</dt> -<dd> -<p> - Simple UNIX mbox splitter program. -</p> -</dd> -<dt> -<a href="git-merge-tree.html">git-merge-tree(1)</a> -</dt> -<dd> -<p> - Show three-way merge without touching index. -</p> -</dd> -<dt> -<a href="git-parse-remote.html">git-parse-remote(1)</a> -</dt> -<dd> -<p> - Routines to help parsing remote repository access parameters. -</p> -</dd> -<dt> -<a href="git-patch-id.html">git-patch-id(1)</a> -</dt> -<dd> -<p> - Compute unique ID for a patch. -</p> -</dd> -<dt> -<a href="git-request-pull.html">git-request-pull(1)</a> -</dt> -<dd> -<p> - Generates a summary of pending changes. -</p> -</dd> -<dt> -<a href="git-rev-parse.html">git-rev-parse(1)</a> -</dt> -<dd> -<p> - Pick out and massage parameters. -</p> -</dd> -<dt> -<a href="git-runstatus.html">git-runstatus(1)</a> -</dt> -<dd> -<p> - A helper for git-status and git-commit. -</p> -</dd> -<dt> -<a href="git-send-email.html">git-send-email(1)</a> -</dt> -<dd> -<p> - Send a collection of patches as emails. -</p> -</dd> -<dt> -<a href="git-stripspace.html">git-stripspace(1)</a> -</dt> -<dd> -<p> - Filter out empty lines. -</p> -</dd> -<dt> -<a href="git-symbolic-ref.html">git-symbolic-ref(1)</a> -</dt> -<dd> -<p> - Read and modify symbolic refs. -</p> -</dd> </dl> </div> <h2>Low-level commands (plumbing)</h2> @@ -993,7 +910,14 @@ development of alternative porcelains. Developers of such porcelains might start by reading about <a href="git-update-index.html">git-update-index(1)</a> and <a href="git-read-tree.html">git-read-tree(1)</a>.</p> -<p>We divide the low-level commands into commands that manipulate objects (in +<p>The interface (input, output, set of options and the semantics) +to these low-level commands are meant to be a lot more stable +than Porcelain level commands, because these commands are +primarily for scripted use. The interface to Porcelain commands +on the other hand are subject to change in order to improve the +end user experience.</p> +<p>The following description divides +the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories.</p> @@ -1040,14 +964,6 @@ </p> </dd> <dt> -<a href="git-init.html">git-init(1)</a> -</dt> -<dd> -<p> - Create an empty git repository or reinitialize an existing one. -</p> -</dd> -<dt> <a href="git-merge-file.html">git-merge-file(1)</a> </dt> <dd> @@ -1104,11 +1020,11 @@ </p> </dd> <dt> -<a href="git-repo-config.html">git-repo-config(1)</a> +<a href="git-symbolic-ref.html">git-symbolic-ref(1)</a> </dt> <dd> <p> - Get and set repository or global options. + Read and modify symbolic refs. </p> </dd> <dt> @@ -1128,6 +1044,14 @@ </p> </dd> <dt> +<a href="git-update-ref.html">git-update-ref(1)</a> +</dt> +<dd> +<p> + Update the object name stored in a ref safely. +</p> +</dd> +<dt> <a href="git-write-tree.html">git-write-tree(1)</a> </dt> <dd> @@ -1147,14 +1071,6 @@ </p> </dd> <dt> -<a href="git-describe.html">git-describe(1)</a> -</dt> -<dd> -<p> - Show the most recent tag that is reachable from a commit. -</p> -</dd> -<dt> <a href="git-diff-files.html">git-diff-files(1)</a> </dt> <dd> @@ -1195,14 +1111,6 @@ </p> </dd> <dt> -<a href="git-fsck-objects.html">git-fsck-objects(1)</a> -</dt> -<dd> -<p> - Verifies the connectivity and validity of the objects in the database. -</p> -</dd> -<dt> <a href="git-ls-files.html">git-ls-files(1)</a> </dt> <dd> @@ -1211,6 +1119,14 @@ </p> </dd> <dt> +<a href="git-ls-remote.html">git-ls-remote(1)</a> +</dt> +<dd> +<p> + List references in a remote repository. +</p> +</dd> +<dt> <a href="git-ls-tree.html">git-ls-tree(1)</a> </dt> <dd> @@ -1304,6 +1220,14 @@ <h3>Synching repositories</h3> <dl> <dt> +<a href="git-daemon.html">git-daemon(1)</a> +</dt> +<dd> +<p> + A really simple server for git repositories. +</p> +</dd> +<dt> <a href="git-fetch-pack.html">git-fetch-pack(1)</a> </dt> <dd> @@ -1312,22 +1236,6 @@ </p> </dd> <dt> -<a href="git-http-fetch.html">git-http-fetch(1)</a> -</dt> -<dd> -<p> - Download from a remote git repository via HTTP. -</p> -</dd> -<dt> -<a href="git-http-push.html">git-http-push(1)</a> -</dt> -<dd> -<p> - Push objects over HTTP/DAV to another repository. -</p> -</dd> -<dt> <a href="git-local-fetch.html">git-local-fetch(1)</a> </dt> <dd> @@ -1336,22 +1244,6 @@ </p> </dd> <dt> -<a href="git-peek-remote.html">git-peek-remote(1)</a> -</dt> -<dd> -<p> - List the references in a remote repository. -</p> -</dd> -<dt> -<a href="git-receive-pack.html">git-receive-pack(1)</a> -</dt> -<dd> -<p> - Receive what is pushed into the repository. -</p> -</dd> -<dt> <a href="git-send-pack.html">git-send-pack(1)</a> </dt> <dd> @@ -1360,14 +1252,6 @@ </p> </dd> <dt> -<a href="git-shell.html">git-shell(1)</a> -</dt> -<dd> -<p> - Restricted login shell for GIT-only SSH access. -</p> -</dd> -<dt> <a href="git-ssh-fetch.html">git-ssh-fetch(1)</a> </dt> <dd> @@ -1391,6 +1275,50 @@ Update auxiliary info file to help dumb servers. </p> </dd> +</dl> +<p>The following are helper programs used by the above; end users +typically do not use them directly.</p> +<dl> +<dt> +<a href="git-http-fetch.html">git-http-fetch(1)</a> +</dt> +<dd> +<p> + Download from a remote git repository via HTTP. +</p> +</dd> +<dt> +<a href="git-http-push.html">git-http-push(1)</a> +</dt> +<dd> +<p> + Push objects over HTTP/DAV to another repository. +</p> +</dd> +<dt> +<a href="git-parse-remote.html">git-parse-remote(1)</a> +</dt> +<dd> +<p> + Routines to help parsing remote repository access parameters. +</p> +</dd> +<dt> +<a href="git-receive-pack.html">git-receive-pack(1)</a> +</dt> +<dd> +<p> + Receive what is pushed into the repository. +</p> +</dd> +<dt> +<a href="git-shell.html">git-shell(1)</a> +</dt> +<dd> +<p> + Restricted login shell for GIT-only SSH access. +</p> +</dd> <dt> <a href="git-upload-archive.html">git-upload-archive(1)</a> </dt> @@ -1408,6 +1336,91 @@ </p> </dd> </dl> +<h3>Internal helper commands</h3> +<p>These are internal helper commands used by other commands; end +users typically do not use them directly.</p> +<dl> +<dt> +<a href="git-applypatch.html">git-applypatch(1)</a> +</dt> +<dd> +<p> + Apply one patch extracted from an e-mail. +</p> +</dd> +<dt> +<a href="git-check-ref-format.html">git-check-ref-format(1)</a> +</dt> +<dd> +<p> + Make sure ref name is well formed. +</p> +</dd> +<dt> +<a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a> +</dt> +<dd> +<p> + Produce a merge commit message. +</p> +</dd> +<dt> +<a href="git-mailinfo.html">git-mailinfo(1)</a> +</dt> +<dd> +<p> + Extracts patch and authorship from a single e-mail message. +</p> +</dd> +<dt> +<a href="git-mailsplit.html">git-mailsplit(1)</a> +</dt> +<dd> +<p> + Simple UNIX mbox splitter program. +</p> +</dd> +<dt> +<a href="git-merge-one-file.html">git-merge-one-file(1)</a> +</dt> +<dd> +<p> + The standard helper program to use with git-merge-index. +</p> +</dd> +<dt> +<a href="git-patch-id.html">git-patch-id(1)</a> +</dt> +<dd> +<p> + Compute unique ID for a patch. +</p> +</dd> +<dt> +<a href="git-peek-remote.html">git-peek-remote(1)</a> +</dt> +<dd> +<p> + List the references in a remote repository. +</p> +</dd> +<dt> +<a href="git-sh-setup.html">git-sh-setup(1)</a> +</dt> +<dd> +<p> + Common git shell script setup code. +</p> +</dd> +<dt> +<a href="git-stripspace.html">git-stripspace(1)</a> +</dt> +<dd> +<p> + Filter out empty lines. +</p> +</dd> +</dl> </div> <h2>Configuration Mechanism</h2> <div class="sectionbody"> @@ -2272,7 +2285,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 19-Jan-2007 00:37:39 UTC +Last updated 20-Jan-2007 02:22:41 UTC </div> </div> </body>
diff --git a/git.txt b/git.txt index ac22206..9761de3 100644 --- a/git.txt +++ b/git.txt
@@ -93,6 +93,16 @@ include::cmds-ancillaryinterrogators.txt[] + +Interacting with Others +~~~~~~~~~~~~~~~~~~~~~~~ + +These commands are to interact with foreign SCM and with other +people via patch over e-mail. + +include::cmds-foreignscminterface.txt[] + + Low-level commands (plumbing) ----------------------------- @@ -102,11 +112,20 @@ might start by reading about gitlink:git-update-index[1] and gitlink:git-read-tree[1]. -We divide the low-level commands into commands that manipulate objects (in +The interface (input, output, set of options and the semantics) +to these low-level commands are meant to be a lot more stable +than Porcelain level commands, because these commands are +primarily for scripted use. The interface to Porcelain commands +on the other hand are subject to change in order to improve the +end user experience. + +The following description divides +the low-level commands into commands that manipulate objects (in the repository, index, and working tree), commands that interrogate and compare objects, and commands that move objects and references between repositories. + Manipulation commands ~~~~~~~~~~~~~~~~~~~~~ @@ -127,6 +146,20 @@ include::cmds-synchingrepositories.txt[] +The following are helper programs used by the above; end users +typically do not use them directly. + +include::cmds-synchelpers.txt[] + + +Internal helper commands +~~~~~~~~~~~~~~~~~~~~~~~~ + +These are internal helper commands used by other commands; end +users typically do not use them directly. + +include::cmds-purehelpers.txt[] + Configuration Mechanism -----------------------
